From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 29 Nov 2024 13:55:56 +0000 (+0100)
Subject: data: Really strip .desktop suffix from folder directory
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~173^2^2~154
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=5d8905c5c7f257358da798cd9dd69266ed15498d;p=gnome-shell.git

data: Really strip .desktop suffix from folder directory

Commit 730fcf34e9 was meant to strip the .desktop suffix from the
desktop directory file, but failed to actually do so: The replace()
method is called on the string parameter before it is passed to
the meson command which substitutes `@BASENAME@`, so it doesn't
have any effect at all.

Really fix the issue by providing the full output name.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3567>
---

diff --git a/data/meson.build b/data/meson.build
index 1d2347d4d..c8f82bd75 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -32,9 +32,10 @@ foreach desktop_file : desktop_files
   )
 endforeach
 
+desktop_directory = 'X-GNOME-Shell-Utilities.directory'
 i18n.merge_file(
-  input: 'X-GNOME-Shell-Utilities.directory.desktop.in',
-  output: '@BASENAME@'.replace('.desktop', ''),
+  input: f'@desktop_directory@.desktop.in',
+  output: desktop_directory,
   po_dir: po_dir,
   install: true,
   install_dir: join_paths(datadir, 'desktop-directories'),